Skip to content

Conversation

@mtsgrd
Copy link
Contributor

@mtsgrd mtsgrd commented Jan 2, 2025

  • decouples reading from workspace from reading from commit
  • prevents FileDiff component from reading file for every diff

- decouples reading from workspace from reading from commit
@vercel
Copy link

vercel bot commented Jan 2, 2025

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-components ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 3, 2025 11:51am
gitbutler-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback Jan 3, 2025 11:51am

@mtsgrd
Copy link
Contributor Author

mtsgrd commented Jan 2, 2025

@Caleb-T-Owens could this be helpful in resolving #5826? It would currently return the full file ofc.

@Caleb-T-Owens
Copy link
Contributor

@Caleb-T-Owens could this be helpful in resolving #5826? It would currently return the full file ofc.

Yes, it could be used in the cases where the two sides have both modified the same file. It would need a bit more consideration as to how we display files that have been modified & deleted though.

@mtsgrd mtsgrd merged commit 96382f2 into master Jan 3, 2025
21 checks passed
@mtsgrd mtsgrd deleted the create-file-service branch January 3, 2025 13:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

@gitbutler/desktop rust Pull requests that update Rust code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants